bitkeeper revision 1.707 (4022a745ygvMeB9hRI-djIrxK1sQiw)
authorach61@labyrinth.cl.cam.ac.uk <ach61@labyrinth.cl.cam.ac.uk>
Thu, 5 Feb 2004 20:27:49 +0000 (20:27 +0000)
committerach61@labyrinth.cl.cam.ac.uk <ach61@labyrinth.cl.cam.ac.uk>
Thu, 5 Feb 2004 20:27:49 +0000 (20:27 +0000)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/ach61/xeno-clone-1.3/xeno.bk

1  2 
.rootkeys
README.CD
xen/include/xeno/sched.h

diff --cc .rootkeys
index e973de536d461213475702e488ae9b82b0a2396b,703a59d1e7b2054a5a9c7c70d583a13183647f20..5f9d42c28646b0b6d51b71e4b5c9605532966cc7
+++ b/.rootkeys
@@@ -61,6 -73,9 +62,8 @@@
  3f13d81eQ9Vz-h-6RDGFkNR9CRP95g tools/misc/xen_nat_enable
  3f13d81e6Z6806ihYYUw8GVKNkYnuw tools/misc/xen_nat_enable.README
  3f1668d4F29Jsw0aC0bJEIkOBiagiQ tools/misc/xen_read_console.c
 -3f87ba90EUVPQLVOlFG0sW89BCwouQ tools/misc/xen_refresh_dev.c
+ 4022a73cEKvrYe_DVZW2JlAxobg9wg tools/nsplitd/Makefile
+ 4022a73cKms4Oq030x2JBzUB426lAQ tools/nsplitd/nsplitd.c
  3fbca441SjQr8vJwTQIgH1laysaWog tools/xc/Makefile
  3fbba6dbDfYvJSsw9500b4SZyUhxjQ tools/xc/lib/Makefile
  3fbba6dc1uU7U3IFeF6A-XEOYF2MkQ tools/xc/lib/rpm.spec
diff --cc README.CD
Simple merge
Simple merge